Update patch status

* d/p/{debian/,}Use-Python-3-for-tests.patch:
  Mark patch as forwarded. It was previously considered
  Debian-specific, but upstream seem interested.
* Mark all other patches as applied upstream for 2018.3

diff --git a/debian/changelog b/debian/changelog
index 9dd08405c052ff5bfbb948dcf3a8b7a944652d8e..b24a5423b733b38cf69e3a64a65159b42c67af1e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ostree (2018.2-2) UNRELEASED; urgency=medium
+
+  * d/p/{debian/,}Use-Python-3-for-tests.patch:
+    Mark patch as forwarded. It was previously considered
+    Debian-specific, but upstream seem interested.
+  * Mark all other patches as applied upstream for 2018.3
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 22 Feb 2018 22:55:11 +0000
+
 ostree (2018.2-1) unstable; urgency=medium
 
   * New upstream release

diff --git a/debian/patches/Use-Python-3-for-tests.patch b/debian/patches/Use-Python-3-for-tests.patch
new file mode 100644 (file)
index 0000000..9a640a1
--- /dev/null
+++ b/debian/patches/Use-Python-3-for-tests.patch
@@ -0,0 +1,45 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Wed, 17 Jan 2018 14:07:32 +0000
+Subject: Use Python 3 for tests
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+Forwarded: https://github.com/ostreedev/ostree/pull/1463
+---
+ tests/bootloader-entries-crosscheck.py | 2 +-
+ tests/test-basic-user-only.sh          | 2 +-
+ tests/test-concurrency.py              | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/bootloader-entries-crosscheck.py b/tests/bootloader-entries-crosscheck.py
+index 5faa548..41f6956 100755
+--- a/tests/bootloader-entries-crosscheck.py
++++ b/tests/bootloader-entries-crosscheck.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ #
+ # Copyright (C) 2015 Red Hat
+ #
+diff --git a/tests/test-basic-user-only.sh b/tests/test-basic-user-only.sh
+index bea7b77..5f27014 100755
+--- a/tests/test-basic-user-only.sh
++++ b/tests/test-basic-user-only.sh
+@@ -28,7 +28,7 @@ extra_basic_tests=5
+ . $(dirname $0)/basic-test.sh
+ 
+ $CMD_PREFIX ostree --version > version.yaml
+-python -c 'import yaml; yaml.safe_load(open("version.yaml"))'
++python3 -c 'import yaml; yaml.safe_load(open("version.yaml"))'
+ echo "ok yaml version"
+ 
+ # Reset things so we don't inherit a lot of state from earlier tests
+diff --git a/tests/test-concurrency.py b/tests/test-concurrency.py
+index 3a0ce10..3ec3681 100755
+--- a/tests/test-concurrency.py
++++ b/tests/test-concurrency.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ # Copyright (C) 2017 Colin Walters <walters@verbum.org>
+ #

diff --git a/debian/patches/debian/Use-Python-3-for-tests.patch b/debian/patches/debian/Use-Python-3-for-tests.patch
deleted file mode 100644 (file)
index 4648679..0000000
--- a/debian/patches/debian/Use-Python-3-for-tests.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Wed, 17 Jan 2018 14:07:32 +0000
-Subject: Use Python 3 for tests
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
----
- tests/bootloader-entries-crosscheck.py | 2 +-
- tests/test-basic-user-only.sh          | 2 +-
- tests/test-concurrency.py              | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/bootloader-entries-crosscheck.py b/tests/bootloader-entries-crosscheck.py
-index 5faa548..41f6956 100755
---- a/tests/bootloader-entries-crosscheck.py
-+++ b/tests/bootloader-entries-crosscheck.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- #
- # Copyright (C) 2015 Red Hat
- #
-diff --git a/tests/test-basic-user-only.sh b/tests/test-basic-user-only.sh
-index bea7b77..5f27014 100755
---- a/tests/test-basic-user-only.sh
-+++ b/tests/test-basic-user-only.sh
-@@ -28,7 +28,7 @@ extra_basic_tests=5
- . $(dirname $0)/basic-test.sh
- 
- $CMD_PREFIX ostree --version > version.yaml
--python -c 'import yaml; yaml.safe_load(open("version.yaml"))'
-+python3 -c 'import yaml; yaml.safe_load(open("version.yaml"))'
- echo "ok yaml version"
- 
- # Reset things so we don't inherit a lot of state from earlier tests
-diff --git a/tests/test-concurrency.py b/tests/test-concurrency.py
-index 3a0ce10..3ec3681 100755
---- a/tests/test-concurrency.py
-+++ b/tests/test-concurrency.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Copyright (C) 2017 Colin Walters <walters@verbum.org>
- #

diff --git a/debian/patches/series b/debian/patches/series
index 066a53d7699cd1ab4a577dcb12fcf234696e9e7c..d60a7cb8ec0ce2db362150a3aa3d897f71350ed4 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@ test-concurrency-Use-Python-3-syntax-for-octal.patch
 test-concurrency-Replace-range-with-xrange.patch
 test-concurrency-Explicitly-use-floor-division.patch
 tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch
-debian/Use-Python-3-for-tests.patch
+Use-Python-3-for-tests.patch

diff --git a/debian/patches/test-concurrency-Explicitly-use-floor-division.patch b/debian/patches/test-concurrency-Explicitly-use-floor-division.patch
index 439ffe9e2b57a1fcfe53ce6665626ecbd3da00db..5855a312d0b539f70ce6ae9bb7fe524eb0bf6874 100644 (file)
--- a/debian/patches/test-concurrency-Explicitly-use-floor-division.patch
+++ b/debian/patches/test-concurrency-Explicitly-use-floor-division.patch
@@ -7,7 +7,7 @@ semantics for division when the division feature is imported from the
 future.
 
 Signed-off-by: Simon McVittie <smcv@debian.org>
-Forwarded: https://github.com/ostreedev/ostree/pull/1457
+Applied-upstream: 2018.3, commit:98b597b465a556f3ad5b16478d7edee3037fbd4d
 ---
  tests/test-concurrency.py | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/patches/test-concurrency-Replace-range-with-xrange.patch b/debian/patches/test-concurrency-Replace-range-with-xrange.patch
index 98b7e00c394139327fe280fc543e81cb6b60b0b2..f0753465b4567f3a7546bb1568f1824d74dfd74e 100644 (file)
--- a/debian/patches/test-concurrency-Replace-range-with-xrange.patch
+++ b/debian/patches/test-concurrency-Replace-range-with-xrange.patch
@@ -6,7 +6,7 @@ range in Python 3 does what xrange did in Python 2. This still works in
 Python 2, it just uses a bit more memory.
 
 Signed-off-by: Simon McVittie <smcv@debian.org>
-Forwarded: https://github.com/ostreedev/ostree/pull/1457
+Applied-upstream: 2018.3, commit:02dc5e2dd47d1be0eb73d2f7e5b588f04c572390
 ---
  tests/test-concurrency.py | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/test-concurrency-Use-Python-3-syntax-for-octal.patch b/debian/patches/test-concurrency-Use-Python-3-syntax-for-octal.patch
index 41f173c1d994c05533892ec2827204e138feb208..096bf2dc13c3643cb5f55e91234bb299b263a104 100644 (file)
--- a/debian/patches/test-concurrency-Use-Python-3-syntax-for-octal.patch
+++ b/debian/patches/test-concurrency-Use-Python-3-syntax-for-octal.patch
@@ -5,7 +5,7 @@ Subject: test-concurrency: Use Python 3 syntax for octal
 This also works in Python 2.7, and is a little clearer.
 
 Signed-off-by: Simon McVittie <smcv@debian.org>
-Forwarded: https://github.com/ostreedev/ostree/pull/1457
+Applied-upstream: 2018.3, commit:9933de232304f47e2be09c72906cc5183d9bbfda
 ---
  tests/test-concurrency.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/patches/tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch b/debian/patches/tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch
index 00a25f29a1e1e53795bbf2ce27dcfdd4dbf9c6ea..035682109e3ea27bf30c9ad610d978aecdf34769 100644 (file)
--- a/debian/patches/tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch
+++ b/debian/patches/tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch
@@ -6,7 +6,7 @@ This is a little clearer than a strcmp()-style negative/zero/positive
 return, and also works in Python 2.
 
 Signed-off-by: Simon McVittie <smcv@debian.org>
-Forwarded: https://github.com/ostreedev/ostree/pull/1457
+Applied-upstream: 2018.3, commit:6cabeaed3f45c8f3e05fb5e1152bfa5b96a3bc79
 ---
  tests/bootloader-entries-crosscheck.py | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)